Got rid of abbreviations in strings, more comment clean up