added generators and return values in function section, added class section