Added bugs / enhancements. Tested Debian / Ubuntu.