Added generic types. Removed C block comments, apostrophe strings & dupl...

...icate line comments