Sanitize track titles too.
Added some todo pointers
rm comments