fixing generics, fully implementing bootstrap node manager