bug fixes and some improvements