bug fixed
bug fixes done