add placeholders
fix, improve logging, redundant find fnc