Misc. planning changes, clean up.