add baseline comparator and fix something