References updated + minor fixes