some improvements commit