Added some implementation issues and made some alterations in general after reading over