Big cleanup
+ Fixtures
+ Fixed scripts
+ Mess Cleanup