name search added

also comments about TODOs and a bit of cleanup