Updated version numbers & enable s-plus building I