Improved and fixed commands, closes #1.