fixed bug i introduced earlier, fixed a few standard tests