Continued work on attacks
Some cleanup and fixes for network