improvements to CD layout and linking up store