updated a few fns