Fixes gesture errors

almost ready for demo