Add some missing stuff, move oct settings to development options, and fix mismatched tag