More commands and bug fixing