fixing some things that were not quite right