fix bugs + upgrade backend