Added bunch of things

Update pulled from dropbox