few issue - fixed