Clean up, package fixes, etc. 

Added a lot of the  packages i had on my local machine.