w00t
fixed merge stuffz
adjusted values and message