minor update, branching to try integrating wiki again