nail down tough cookie
merge
fixes and enhancements discovered during demo