Added singularity! and fixed a few minor things.