Massive Update

Added a few new features.
Fixed a few bugs.