bug fixes done