Change code and add output from SLAC

Just some code changes based on SLAC week 2.