Changed softtabs to 2 spaces, minor tweaks