Made a lot of changes

kjhlk