rebased rust
more little bug fixes