Misc. bug fixes, integrating Gwen's content