timing fixes, pattern clarity