brought code up to par with altis
fixes for bad merge.