Refactored minor glitches 2