fix discard qualifier warnings
add newlines at ends of included songs
fill buckets when the same cat type falls