Fixed 4 +- bugs