Changed if/else chain on message tome to a switch/case, and prevented blank messages