Carrousel improvement and code refactor. Most errors solved.