author pages
more fixes
conflict fix