added some TODOs for future reference
Added some TODOs for future reference
Changed a few instance variables to final