fixed some more bugs with intents