Big update again

Thanks to multiple people, especially cj and mrsieb