More organisation stuffs + fixes

fixed r-click while looking at block not working