updates
updates
fixed conflicts
better formatting for agenda views