took care of TODOs + made link text match page titles. closes #91