update to 1.2

General too many bug squashed