Many tweaks. Basically ready.