Updates!

Lots of things added, now fixing bugs.