fix this and that, here and there