some more changes in content and theme