more small changes, fire alarm interrupted...