Changed so only Cart state is saved to session, not the whole cart object.
Minor cleanups.