fix tabs/spaces, add new config setup