fix here and there