Continued fixes on parser.js - better timing