hub.h added && cosmetic changes in other files