Some syntax and pep8 fixups
Assume 732 days to be closer to amazon calc
more pep8 fixes, add some more columns