Finished fixing all constructors.