Fixed specs. Improved standards