Bugs

- Bugs fixed