fixed #108 and for #107 everything except 29 tests now pass