Updates

- Code stability
- Code fixes