Fixed to work with windows machine. Other misc. changes.