next version and minor fixes