0.2.12  Minor changes and bug fixes