-----Feature and Bugs-----
- Fix some issues