Final push to 1.2 and many bugfixes