adding lotsa littls fixes for 2-2-stable
version bump