tpyos and cleanup