Goals document format fixes