small improvements in the architecture