Issue 95

solved and some bits by the way.