minor constructor changes