Fixing a few warnings in the parsing. Getting there now...