minor updates and a fix when add goal is enabled