Adding some new intents and fix some issues.