Added searching for strings, as well as cleaned up and improved code.