moderate refactoring, removed several unnecessary TODOs and re-commented portions of classes