Add new strings and do some cleanup