fixes done as suggested