#2 Cleaned up package usability a bit