fixed a couple small bugs
wip