Add lyrics + clean up