Added comments; changed messages again