little fix here; little fix there