adjusted rules and cleaned up - a bit