Reviewed code, removed/added some TODOs