Changed some things

Changed things to make more sence.