optimizes transitions
sets demo to use defaults
updates to current version