styling and translations
fixing specs
fixing the specs
mergies fixed