closes #224 #225 #237 #238