Finished cleanup, started work on custom TNT