Improved parsing, fixed case where words within words gave false positives