Reviewed code, added/remove some TODOs