small bugfixes and some word changes