Minor fixes, and added inital data ArtworkMap...