Fix'd for all that stuff.