fixed dates
click to display
visual tweaks, fix line in and out
badly merged
merge again?