Various tweaks. Can run from the frame now.