design changes
changes to make dev system work on windows