added factorial to calc parser
various changes