making some improvements...