Formula parser improvement and other fixes