More progress on sketching improvements and #2444