1.2_01

Bug fixes