Further updates

Shown to Mark Da Rocha