various fixes, getting rust more better