small bugfixes and removed/added some (un)ncessary text