fixing some of the little things...