Additions/fixes from rww.io
Some fixes.
More updates/fixes from rww.io