- add missing function args
- get rid of multiple definitions