fixed things
fixed/added things