fix some problems, change some tactics..