changes everywhere!!!!
- bug fixing