Fixes

fixes #199 #203