Massive update and additions