fixed mistakes (hopefully...)