minor texting changes
bugfixes and improvements