Fixed bugs with jarvis