Adds some parsing methods. Finds a nasty bug.