Small style tweaks, and widened bounds on base