some reorganisation, added some more information about uninstall and so on