change msb to repo; add more goodies