More on 1_2, started 1_1, fixed animations