final changes before launch
fixing massive conflicts