fixing up some stuff.