commented off stff; fixed active field detection; etc