macro seems to work
macro works
code cleanup
trying to improve find-free
merge