fixing here and there