made lots of changes

changed a lot of things