Added advanced mode, extended calc