Changes made based on feedback for submission into Debian repo.