stories template, bug fixes & enhancements, cleanup.