Fixed unicrap, added more, and toes upstream's lawn.

Conflicts:

	lyrics