Fixed Minor Glitches