Bugfixes and new cmd