fixed another crash and cleaned some strings
some code style