Some minor glitches removed