some fixes for pupil aiming