Update 1.2 - bug fixes and more