fixes and filling of content