new classes and commands, format fixes