Fixed whitespaces to correlate with thraaawn's scheme, also pulled in thraaawn's latest changes to ease integration.