fixed and uncommented messages, sorry...