Added arrows and some general clean-up