implement sails fixes, closes #21
2.0.3