config restructure, spaces -> tabs, small fixes