comment cleanings
network fixes and rework