Some fixes and adjustments; note.