fix here and there

a miracle happened