Minor code improvements.
Merge remote-tracking branch 'origin/master'
Merged new design and networking.
No statistics are generated yet.