More logs, removed category name check, handling "?" in goals