Modified defaults and added more individual parsers.