Cleaned up some TODOs and finished the Network event getters.