fireman 2.1, minor changes