Reviewed code, made some renamings, added/removed some TODOs