bug fixes as per screenshots in prtscr folder