Major update to practically everything

Major update to practically everything