Added categories and deals.  Fixed bugs.