All bug fixes done