handle more metadata

still not completely done, stupid christmas thing is making me waste time.