Fixing version 7.1.1

Some bugs have been found in the latest version, so I am fixing those. It is frustrating that even if alllocating time to test, some bugs still slip through. Maybe having a longer test period next time?