20 dec feature
20 dec feature, some cleanups and add today's data
remove debugging for now