minor changes, made dateformat shorter by default but customisable