Updated to build on cygwin on laptop
local fixes
faster solution?