Development thijl

fixes #107 #106 and #110