some rework
some better comments and win32.mak fix