More fixes and content