misc additions/changes