Small fixes; new stuff on some stages