Set of tweaks. Almost ready.