fixed everythin