changed: don't use parameter names that conflicts with member function names

quells warnings (with gcc 4.8)
fixed: mark static symbols as such to quell warnings
fixed: remove misplaced semi-colons