More bug fixes, wiki extension