some rough additions, theme changes