Save minor changes
Change comment format
Implement new methods for NetworkState