add book link in header and fix color nasties
fix merge conflicts