Minor changes, create goal now does both types automatically.