fixed initialization, added default init
merged