Comments and more error catching