change stuff up and added some comments
Merge branch 'Kaibo's-Brancherinos'