merged with master
Making links work, etc.