changes: Bug fixes again. One is significant: it stops gxine from (potentially) eating lots of CPU time