Porting changes back from main repo, indenation is now in softtabs