code fixes done