added a few more strings and tweaked a bug or two