Cross platform client working

Many adjustments made for cross-platform dev.