- network check to prevent crashes
- some bug fixes