New features, more scripting cleanup, etc