Improved the pacifier messages a little and cleanup up some odds and ends.