Added two commands, some bugfixing.