tweak comments and layout