Cleaning up some comments.
Closed #1. Added name to the form and updated the logic to reflect changes.