Cosmic Theme, and minor bug fixes