Fixed bugs, added arrows
Merge main.js