some samll improvements