fixed broken init stuff