Design tweaks

@matthew-andrews 

Bringing in all of @pauloneillft changes + verify fixes + making demos work.