merge in chagnes from touchList and touchForms from chapstick

fixes #46