fix enter behavior; todos complete