Changed some stuff and things