added default messages and minor formatting changes