some improvements and management