some stuff fixed