more fixes, more content