Bug fixed in base_calc(); no more score variables; some minor changes