various tweaks and corrections
pom cleaning