Make things better here and there