Updated.

(this thread could probably be trimmed down if anyone feels so inclined)