Fixed minor glitches