fixed a couple minor bugs, a little cleaning