added content, various fixes and tweaks