Reviewed code, added/removed some TODOs

Also mad some renaming