minor changes, included Apple+Win/Linux support