Slight tweaks, wider math