minor correction
added settings
more parsing, slowly