A few stability fixes and more info on evnironment