Updates and Bugfixing

Added some stuff