Small fixes, content rewrites