minor improviments in ais mode