ibaa changes / stoffez changes / clean ups