Fixes and adds a bunch of stuff.