set correct annotations for some options objects
add some missing properties