Renaming vars and small fixes.
Deal search and notes.