fixed some minor glitches