more home page stuff
merge