Cleaned up and made small changes and fixes to display and network.