Minor bug fixes; GPLv3 included.