remade
minor fixes