Updated to latest options and TODOs