Data form updates and general cleanup for deployment.