Changed some files and stuff