Added a bunch of comments / deleted old code