Typo fix, added bug
Various work on 1.2