Mostly Comments

Made some changes that should probably be in the next branch. Woops