cleaned up teh recorder post merge...