Changed some bits and things