Updated logs, misc updating to filter