Fixed arrows, and more bug fixes