* cleaned up some stuff

ready to begin work on comms window