adding correct arrows and more polishing