Fixes, documentation and tidying of kiwi code