Massive Update

many thanks to HeaL