Added Things support, fixed some other things