improve and add lots of content