change stuff up and added some comments