more C++ fixes

Add a 'builder' for options too