Fixed bugs, and added arrow to path