name tweak
Merge branch 'refs/heads/master' into clean
final props
enhance bounce