Display tweak
Remove old code
Disc::MarkState -> Mark::State
Run proper mark/remove update
Fix some marking bugs
Pop pause