improved some stuff