safer
minor updates