More work on Plans mostly

Other cleaning ups as well.