some minor additions/fixes