Minor tweaks; 3022 bytes