Bug fixes

Performance enhancements, links, etc, etc