stroop and some fixes