Updated some asthetics
Acknowledge Wouter's helping hand