Update from main fork

Please merge this before continuing. This update has the highest priority