Various additions/fixes