some upgrades, add PyLD