additional updates/fixes