Published version 48, minor fixes and refactoring