added a teardown and some messages