Fixed constructor issues, added defaults