restore shr + formatting fix
make shr depend on shift_right, not the other way around + general clean-up