cleaning up, fixing bugs