Improvements

mister, please be so kind as to review this