Added agenda shortcuts/configuration and some minor fixes