clean up
make springiness optional
clean up / refactoring.
modal demo