Fully functional product.  app.js fixes, clean up