more fixes to basic content