Updated and fixed calculator/parser