Bunch of Code.

An Update, bug fixes and etc.
Merge pull request #3 from x0DarkShadow0x/master

Sgt Marine Fixes