various bug fixes; theme enhancements