Fixed various minor glitches.