Added more user-friendly messages
More stuff