fixes from initial base commit