comments on layout extensions, some cleanup