lots of edits to standard library