default handler support, updated TODO and README