Fix'd lots of stuff