various text changes and bug fixes