all fixes done