albums can now contain sub-albums
misc fixes