refined some stuff