fix for Windows Machines
minor updates
version inc
minor refactoring
refactoring
updates