fixes done