a few more asthetic changes, really I'm just committing this so I can edit it from the catlab