Updated to new makefile and glossary additions.