Package docs
Adjust comments
Cleans up tests a bit