misc fixes and content