even more cleanup. added arrow-directions