Various enhancements, mostly Debian oriented