Xiki module: fixed stuff broken by moving into module.
Specs: got most to pass.