few adjustments on layout, comments