auto-formatted tabs, minor fixes