lots of fixes

Signed-off-by: Riccardo Iaconelli <riccardo@kde.org>