better messages; debug removed