Bug fixes and content tweaks