lots of changes and some content