fixed formatting of option types
finished initial set of alignment errors