bug fix
Removed unused strings
more accurate search
Credit comment
Debugging Code
Added check for component
Fix SEF