Fix some stuff
new fixes