Alrysc

This PR select changes from the development branch that appear stable and that don't interfere with current mods. There are a few other changes that fix a few of these...