minor changes, added some new goals