Added some logs, better goal names