bit of design, bit of bugfix, bit of polishing