fixing a bunnch of things