Minor comment change and small bugfix