More comment and asthetic tinkering