minor changes + new class Goal Learning