solved issue list 2
bug fixes