Cleaning up comments and fixing selectedOption logic.
Adding additional testing for selects.