Shored up many sizing issues