Added date support, fixed indenting