Changed some stuff and comments and stuff