Finalizing misc cleanup and corrections