Various goodness updates to get things back to the way they were on old machine, or better