Added 'any' support -- also added some more comments