General cleanup and some planning.