Further simplified initialization, added defaults