Fixed a couple bugs. Random note, my PHP linter works.