fine tuning some stuff.