handle feedback from last PR, updates for latest rust