updating to make comments work
views
adding a couple code comments and making comments work
updating from the merge