jenv
Fix rebase
Better error messages