bug fixes

just a days worth of bug fixin'