layout fixes, stub for batch comprehension