More for viable releases

and minor fixes