Changed some stuff, and added some functions.