added some content and fixes