various fixes and tweaks (content related mostly)