big update

Added a bunch of stuff, almost done.