Resolved/deleted/moved some TODOs + improvements