Merged work:
- gallery updates
- various bug fixes
- minor enhancements