still fixing bugs. a bunch of bugs still left to fix