Additions/fixes from rww.io (final merge).

Final merge.