Major update to just about everything