No content bugs, several fixes