major: improvements and fixes