some refactoring and updates to content