Filling in commands and testing

Minor changes this commit.