Add missing options, general cleanup