changed some bits and bobs