Fixed: various
Dev. checkpoint: Touchups.