fixed some bugs, added jarvis (BorisMinaev)