More stencils, some gui work, some tidying