Add names and fix overlap bug.

Also, fuck carriage return with a rake.