title fix and who for
merging master to pages again
new index