fixing a few simple/silly bugs