fixed some bracketing