Fixing minor stuff on all until section 4