cleanup
adding glossary
fixing some hyperlinks
macro