add expand/collapse objects and functions; clean up template; bump version