updated todo (1 bug, other cosmetics)