dk's PR crosses off two items from TODO