Rik Hemsley (rikkus) <rik@kde.org> Ryan Cumming (Phalynx) - bugfixes and improvements