Additional commenting and layout improvements