Fixed almost everything
Final code before launch