added right click cycling, fixed x marking causing offset