minor, changed constructors