some more content + fixes