massive update and fix