quick fixes done