Added some content and fixed #6