A ton more updates for 1.1