More updates. Added a bunch of stuff.