Minor comment changes, fix null pointer exception