fixing some more goofs