Cleanup and fixes, finished confirm for burning