Some improvements on the update parser, but still not good enough...