various changes and refactorings.