updated a lot of things

updated a lot of things