Some minor changes. Sticky form still broken, but close to fixing