Fix some things and add a little bit more content