Merging Tucker's changes, unit test fix, and package info