Updated further based on review for Debian submission.