Fix and changes
Fixes and create files