Rearrange risk stuff
Some stuff in risk shell
Risk chapter fixups
Risk cleanup