Reviewed code, added/removed some TODOs

Also renamed Run to Main