fixes and new xs defenition
content was moved