Fix errors
Improvements