improve and add lots of content #2!