some refactoring and updates to wiki