fixing some conditional chains and messages