fixing up some things
need to test everything