more additions/fixes