Added some bits and bobs