improved some stuff.