Mass Update 2, lots of fixes here