Merge pull request #1 from brandonrninefive/beta

Beta
Merge pull request #2 from brandonrninefive/beta

Beta
Merge pull request #3 from brandonrninefive/master

Fixing some things