Fixed bugs, added arrows