Add options to make only<> more strict
Make overrides more explicit
Whitespace