fixing some of the ugly up