some fixes
fixed initialization