Some cleanups of deliverable forms and planned/actual logic