Bug fix that told the connected client that, when a new song is selected and it isn't playing, that it was playing.  Also some minor refactoring.