Marked "for testing". Minor fixes.