comment changes, short circuts for nulls