more function declaration corrections