resolves #153 - cleaning up bloopers in the tab order