day as 3rd parameter, more comments, new testcases, fix layout-error