Feature/better messages