More code clean ups and fix

- fix for issue #12
- remove out commented code
- fix C file header