Added and fixed a bunch of stuff