Added more commands, changed style