fixed init stuff