Updates for 1.1 almost done