use universal path separators (instead of windows specific). Minor header cleaning