some stuff fixing