preparing for UC2.1. Minor bug fixes in UC1.2