updates in parsing, esp for mysql