#12 Fixed problem with internal network messages being merged and updated tests. Also added some additional formatting for the web interface.