few issue fixed