Storage shelf fixes, beginning of xp book rewrite