fixes and updates - 0.40b