bug fixes done for this round