Swansea Workshop

various changes made while in Swansea