Issue #30 Updating javadocs, added checks for values not found in parsing and other review changes