most fixes done