some refactoring
added a few more useful intents
bugfix