update for 1.2 + goodies