cleaned up some minor glitches