Updating: misc additions/changes