Reduced arrows to one rotated arrow

Fixed some bugs/NPEs
Merge remote-tracking branch 'origin/master'
Adjusted