some changes
several upgrades