Version 1.2

Big changes, see version history/comments