massive update. getting close to next release