couple of changes here and there. Mostly refactoring the structure