Wiki+ fix/tweaks
Wiki+ usability fix, and other fixes