Some code clean up. I added the else keywords that Robert suggested. Other fixes for problems that I noticed.