improvements for xiki