fixed some content bugs