Additions added

I plan on looking this over again soon.  But in the meantime here's the requested changes by @ipwnstuff