fixed some stuff in the initialization
fixed