Fixed RF issues and cleaned up.