More work on scrollables (still broken, but getting better)