- Fixing some bugs