Fix platform-independency; add comments