updates for latest rust, vague cleanup
properly handle vector arguments, simplify
properly handle vector arguments, simplify
redraw
redraw