Did some work.
Fixed some more stuff.