Add horizon angle and naive argument checks