fixed defintions, (added const in header file where needed)