some stuff fixed maybe?