Tweaked some of the new stuff
Merge pull request #70 from cybrxkhan/beta

Tweaked some of the new stuff