Parser fix and lexica work