Misc issues and mini features for next release