issue #104 #98 #97 #95,#94,#93 fixed