Removed some TODOs and added comments