updated to latest rust and started tweaking some functionality