Merge

Couple of bug fixes and new content.