more tweaking with tank detection, etc.