added back a bunch of the stuff that was ignored. Hopefully that isn't bad :)