changed some minor things in 2.1