Merge pull request #3 from brandonrninefive/master

Fixing some things