fixed in some places, yeap!