A little refactoring and some updates, adding @package to help denote where the references came from