Extreme improvements
Slightly less ugly.