changed upto-null back to func, since macro wasn't hygenic and I'm too lazy make it so
added picture/cover-art support