final fixes ready for publishing using 2.1 framework.