Added Javadoc, added some string utils