Improvements to the divider [#76]