renamed some of the views, cleaned up a little bit and added some comments.