added more error conditions
added single command. can't verify it works yet