Renamed error
some fixes
removed those not needed files
another hw
Merge branch 'master' into loganhasson-work