Bug fix
Refinements and bug fixes after teaching at CUFP.