fixed up bunch of stuff