refactored views, finsihed up comments, and numerous small updates