Fixed some stuff

FIXES