More minor tweaks. DAMMIT FIRENG CONFORM TO MY STYLE
Can you say 'minor changes'?