Added support for albums and songs, several bug fixing