section 1 and a few fixes