Major improvements
- fix setter