Added general cleanups
added things in failure, just general updates