Documentation; minor performance improvement