Some content and some fixes