Smalle changes and design fix, set version to a2.1