tip option and some improvements