renamed keywords; added defaults for action-type and track