Updates and Bugfixing

Updates and Bugfixing