Tweaked out minor bugs