Small fixes
Cleaning some code
Added playlist functionality