update
merge
fix athome and add org-agenda keys)