Added a rules message and improved check