Updating uflex and general changes