sync with latest changes to wiki