updated fixes from mikeb