fixing up some things, still fugly though