sync with recent changes to wiki