fixes in response to gabriel comments