fixed some +/- issues