Fixed management commands
Major bugfixes