Refactoring, bugfixes and MixtapeRowList added