Closes #8 - plus a couple of visual changes