lots of small fixes

fixes: #1100  #1098 #1094 #1101 #1105 #1104 #1106 #1109 #1113