fixes done ... keep testing