random runtime tweaks
Reorganize and expand runtime.