clean up for PR to head, add feeslike logic