sorted some stuff