Command Changes and Bugfixes