Fixed some things
fixed more things